Improve documentation/commentary