Remove duplicate code from merge.
Adding spelling and stylistic fixes.