Refactor 2022 #34