Refactored the if-sentences#13

laurikadakas wants to merge 2 commits intotutinformatics:mastertutinformatics/refactoring:masterfrom

laurikadakas:masterlaurikadakas/refactoring:masterCopy head branch name to clipboard