added basic expression simplification