formatting/etc fixes for a clean qulice and checkstyle