table: refactor.