Refactor 2022 #23