Added Twitter old-style + refactoring