Made semantic fixes based on review