Move some code around, improve documentation
4 files changed