format cleanups
sync int sizes