Tidyup: no longer needs temp var