- Bug fix.
- Code cleaning.