Cleanup and doc fix