Refactored setup
Refactored setup