Code clean up.

Fixed indenting, made placement of curlies uniform.