fix indent and other