Refactor 2022 #31