some additional cleanup and documenting.