Simplification
Minor tweaks