Would you mind ensuring that the curly braces for these kind of situations are one line, as the original code had?  It's easier to read IMO and less space wasteful.