Update documentation + minor clean up