Make edits and simplifications after feedback from NF board.