Refactor TypeDeclarationExpression