Indentations, small tweaks