Refactor: