Iteration 5 dev code pro fixes

Fixes all the code Pro Violations