Code pro fixes

Refactors a lot of code to make CodePro Happy

Author: Shockolate