Checkstyle fixes.
Checkstyle fixes.
Checkstyle fixes.
Checkstyle fixes.
Merge pull request #289 from Unicon/CHECKSTYLE-4

CHECKSTYLE-4: A number of checkstyle fixes