checkstyle compliance improved
Merge pull request #2550 from jerrinot/checkstyle1

checkstyle compliance improved