refactoring: operator is now an enum + fixed bug in translation