Make code shorter and more cryptic

I don't know if it's better this way. At least it is shorter, so it might be a bit easier for me to reason about later.

I suppose there will be more refactorings to come for this.