refactoring, more magic commands for Azure