Better docs
Cleanups