clean up and Documenting