tweaked some helper function naming conventions