Move to same line braces

I've begun using same line braces to be consistent with the preferred way of writing Swift.