Refactoring setup class