Removed private setters
Merge branch 'master' of github.com:Timmay24/SE1