Documenting and cleanup