More code cleanups. Completely finished with PersonRecognizer