Removed all System.outs in favour of logging messages