Minor cosmetic improvements, remove dung code.