inlined Person fields where applicable and cleaned up code