refactor: cleanup unneeded type casting