Added UserDefinedType, cleaned up case formatting