Refactor 2022 #15