Refactor object property evaluate