cleanup: use postfix notation and unless