Finalized refactoring for twitter module.