clean up use of helper methods and unneeded comments