rename & fix indent