don´t need w switch for these checks

don´t need w switch for these checks, change if statements some.