indentation fix and refactoring the function
Merge branch 'master' of https://github.com/navina/avaaz