Changed to snake_case based on suggestion from Dougal and cleaned
up some of the code.