Removing as many System.out.printlns as possible in favor of logger