Small edits, indentation fixes