refactoring fun
more refactoring