WIP cleanup inputtypes.py