Dumb improvement; each block has vars :|