Cleanup
Improved setup documentation