I think it's okay after the refactor, but if we really wanted to, we could make it a one-liner. ;)