Refactor 2022 #26