More codepro fixes

Refactors to make CodePro even more happy!

Author: Shockolate