Clean up code again, fixing control statement new lines.