make the setup script cleaner