Refactor 2022 #37