Fix checkstyle whitespace issues
Fix checkstyle whitespace issues
Many checkstyle fixes
Remove unchecked exception, turn on checkstyle warning to match, fix test to match