Refactor code.
Merge branch 'master' of https://github.com/dst-hackathon/socialradar-android