Refactoring cellvaluefactories of table