Cleanup to lang code.
Refactoring of DUB console listener code.