neaten up the setup script