Refactored code
Merge branch 'master' of https://github.com/05K4R/OOP-Projekt-grupp-16