Changed indenting size to 2 spaces, some more fixups on the cpp files