Code Cleanup

This commit applies the latest coding conventions to the big-refactoring-2012 branch.