Did some more general cleanup and documenting