Methods refactoring