move things around
add utility method
refactoring