Code now meets style guide. RIP diffs