Reordering of sanitizing and cleaning functions to provide more consistent storage and output.  Updated to 2.0.7