Refactoring.
Remove debug code. Upgrade vid quality.