Tidied up operators to make sure they're used consistently