Minor comment/style fixes