Refactoring for it to provide more readable mehtods