Refactoring methods