CodePro fixes

Modifier Order low flag
multiple return statements low flag

author: Shockolate