Technical debt: various checkstyle fixes and auto-formatting.