Refactor 2022 #24