More clean-up and namespace adjustment.