Remove usage of 'and' and 'not', use && and ! instead