Fixed several code comments and minor code stylings

A couple variables that might not ever be defined, etc. Nothing crazy.