Lots of coding guidelines cleanup.