Cleaned up location json model