Clean Code

Minimizing else statements improves code quality