2 space indents, other tweaks