Tidied up a lot of the System.out.printlns