Update indentation
Switch dependency order