refactored twitter
refactored twitter even more