simplified a few expressions