* miscellaneous checkstyle CloseBracketLine fixes