Cleanup some syntax and formatting.