Environment Setup, Refactoring