Simplified the setup steps