cleaned up setup script