Minor updates to commenting and code