Refactor 2022 #12