- Fix "admin-uuid" bug
- Formatting (swap spaces for tabs)
- Remove unneeded comments