Documenting and clean-up.