fix indent & some code