Fixed formatting
Fixed newline checkstyle errors