refactoring and add json method to twitter model
merge conflict