Reformat
mvn: javac -Xlint:all
Merge commit 'turenar/misc' (Cosmetics)