Fix formatting

- Spaces to tabs
- Reorder