refactored twitter