Update README.md file
Add conditional to setup function
Clean up code