Refinements in Azure script