Removing single line if statements