Move to same line braces

I've moved to doing braces on the same line. This is mostly to be more consistent with the seemingly preferred way of writing Swift.