fix indent and clean stuff