code style improvements

Reformatted whitespace to match code style.
Refactored upper case classes/methods to use camel case.