Refactor ICP.