refactor Class func. to Category func..