Minor comment and code style fixes