2nd round of edits/format