Refactor 2022 #30