Cleanup to match project standards.
Again.