Cleaned up setup script