Improved if else statements