Ran code inspection and reformat on all code.  Cleaned up code.