Clean up and fix style issues.