stable devops process plus some refactoring