Made the following changes:
http://tintin.cs.indiana.edu:8091/browse/PSU-125->Using CamelCase for
variable names
http://tintin.cs.indiana.edu:8091/browse/PSU-126->Formatting changes