The refactoring never ends! :snake: