indent and code cleaning