some edits and formatting