tweaks: reshuffle some declarations and trim a few comments
1 file changed