Improve documentation and obviousness a bit