TwitterLocation model, refactored other model code