Refactor 2022 #20