First version of refactoring - !usernames are not twitter-usernames anymore!