tweaks: retype, rename, and reshuffle a function
3 files changed