Fixed maths so that it follows BODMAS