Working on docs
Clean up some duplication, improve some names