refactor the helper methods into one file
clean up my refactor a bit