Update dependencies in debian package.
Minor refactoring.