More simplifications and parenthesise fixes