Is this basically about removing the `before` statement? The less code the better :+1: