A bit of cleanup and coding standards.