Yeah, that's cleaner; I'll change it