clean up from review, move vars into helper methods