Addresses issue25.
Fixed code style issues.
Fixed code style issues.
Fixed issues identified as step 3 of the LSAP.
Merge branch 'fits' into 7.x
Fixed minor coding standards issues.