Refactor 2022 #16