Simplify
Minor changes.