more INT32 refactor