setup script now cleaner