cleanup + some comments
removed constants for remapping (for uc and cd)