Issue #93 Fixed Checkstyle violations