style nit-pick: could you remove this `then`?