checking for more refactoring