Cleanup typing