put back the indent and clean code