Refactoring to request