Removed case redunduncy

Switch cases should be more readable now.