First commit of redone cleanliness and completeness code