Made switch more readable