Reindentation to 2 spaces, other small changes.