Doc clean-up
Cleanup + setup for make