Fixed trailing whitespace and indentation checkstyle warnings

All tests passing.