Tweak indentations a little bit - still not perfect