fix sonar nags re: array bracket positioning; switch ArrayList to List; minor reformatting of a few files