Code refactoring: Make services for SCM and Environment Managers