Added location to user schema and cleaned up user model