Cleaning out 2clean and adding some output stream (still need to doc and test)