typing cleanup