Refactoring to consider