Cleaned up Person and Key code, Better resource methods