Formatting code to be compliant with SANDAG standards. (ABM-144)
Merge branch 'feature-code-cleanup' into develop