Fixed some bugs, and improve formatting
Merge branch 'master' of https://github.com/SoftUni/JavaScript-Applications