Coding Standard violations

Fixes 27 violations