Refactor (2022)

Refactor