Indent and some minor changes