More cleaning and documenting...