Extract private inner class DiffExtractor.

Extract private inner class DiffExtractor. Rewrite code in accordance with @kcooney comments.