Aesthetic and fixes to simplifying expressions