cleaned up DefaultCodeDefinitionSet.php