Refactor 2022 #36