Issue #2920737 by DamienMcKenna, MustangGB: Major code cleanup; resolved most of the coding standards violations, excluding class, method and property names.