added more cleaning and cleaned up the doc a little bit