Person class
Merge cleanup