Ran checkstyle and therefore had to make a bunch of changes as a
consequence!