Code cleanup
Renames variables, shorter and better
Cleanup elba:detach method

- Move logic to Client#detach
- Adds test