Make sdd::carrier internal and some code cleanup