Some refactoring and work on persisting tweets