Switch Statements

Changed if/else statements into switch statements