Refactor 2022 #29