Minor refactoring; improve documentation