Refactor 2022 #17