Small refactor

- Use (zero? ...) over (= 0 ...)
- Use (when expr ...) over (if expr (do ...))
Remove newrelic