Refactored methods to achieve one action each