hit it with the refactoring hammer