Minor changes to commenting