Cleaned up the setup script.