Fix indentation
Homogenize fn escape clause style to include braces