Tweet data model + refactoring