Code refactoring
Twitter and BBM integration