Some refactoring of the code, nothing big.
Merge branch 'master' of https://github.com/stanevplamen/JataakaTeamworkProject.git