hey more refactoring