More refactoring methods into smaller functions