Formatting changes

- Braces
- Use of instancetype