Added headers and removed printlns