Refactor 2022 #19