Formatting and small edits