Some refactoring on TwitterCrunch