refactor simple methods to remove duplication