Refactor 2022