Cleanup to follow formatting standards.