refactor cell references to use pcell