Refactor 2022 #33