Refactor 2022 #32