(OFBIZ-11947) Also fixed some other checkstyle issues that requires re-factoring. Thanks Jacques for review.