Rename variables and refact methods
Merge branch 'master' of github.com:androidsx/our-other-apps