CodePro/Eclipse formatting, slight refactor