Added normalisation of expressions