Coding styles

Created by: emcwhirter-usgs

Clean up spacing, variables and organization to match coding standards and maintain self consistency.