Marginally improve documentation and comments