More cleaning, handle output better.