[enh] more optimise and better way of changing the indentation