checkstyle cleanup and formatting of the source
Merge pull request #643 from Unicon/cs-cleanup

checkstyle cleanup and formatting