More type cleanup