Refactor 2022 #27