Minor clean up and variable clarity.

Minor clean up to conform to code standards .
Changed name of certain variables/functions to conform to a uniform
standard.