Fixing up formatting and compliance.