Lots of changes related to new code formatting guidelines.