small refactor
got twitter working now too