Addition of previously omitted constants and coding style change

Added previously omitted two constant variables and changed all new constant variable to accord with google c++ style. 

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml