Change indentation and a few minor edits