small changes to prepare data
Merge branch 'master' of https://github.com/easilyBaffled/Twitter-And
be careful with class names