remove one-line if statements