I didn't add new braces, just break a few one liners.