Could we make this a block instead of a single line check? The unless gets lost easily at the end like this.