Clean some of the code. Backup #2 before redesigning PersonViewController.