Some cleanups - moved the twitter specific code to a separate module