Refactor Class Expression, to use Machine Class