Cleaning up and documenting