Issue #129 Fixed checkstyle violations