- Cleanup a bit the code