Indent and other minor tweaks