Refactor twitter data import

Past due by 25 days 63% complete