function refactorings
Merge branch 'master' of https://github.com/jhaarni/tweetiment