Don't mutate module-level object
A bit more tidying up