Environmental Service & refactoring