Minor updates to docs and code cleanup