code cleanup and better naming of methods
Jeromy authored
13de031b