modify indent and comments