More consistent indenting