This is all just removing the if and un-indenting.