Refactoring of complex If-Else statements

Run test to see before and after

php vendor/bin/phpunit --coverage-html report