Updated code and removed printlns