* renamed some variable names

* renamed some method names
* Refactored some variable names
Merge branch 'master' of https://github.com/tsvetomir-nikolov/QualityCodeTeamProject