Refactor azure