Cleaned up the Person Class