refactoring to remove