More cleaning, no implicit, doc'ed.