Changed Checkstyle again

Less final parameters, more whitespaces
Merge remote-tracking branch 'upstream/master'

Better checkstyle, again