Coding standards, cleanup.