Minor changes to code (mostly comments)