Cleanup, reduced whitespace and printlns