Fixed checkstyle formatting error
Fixed checkstyle warnings