- Made the if-else 50 rows shorter