Refactor 2022 #22