cleaning up and documenting