Refactor 2022 #38