refactor a few things, clean up twitter username extraction