24 fix indent and source format