cleanup type casting code
2 files changed