Refactoring following [vdlow pull request](https://github.com/mariosangiorgio/RateMyApp/pull/11)