Clean up formatting, light edits.