Formatting
Added DEFCLASS*