Coding standard compliance

Resolved various coding standards issues reported by checkstyle and sonar.
Resolves issue #3.