Fix field name to coding standard.
Clean up file to match coding standards