azure - refactoring