More cleaning, documentation ...