format edits and minor changes