- Fix a bug with counting the free disk space
- Cleanup