Refactoring our environment