Further cleanup and doc