Refactor 2022 #13