Redoing my if statement