Refactor 2022 #21