Indentations and minor tweaks