Code style for return statements

Wrapping all returns from if statements in curly braces and indenting on new line