a few line length and style cleanups

per my comments on the PR

this is based off of your `origin/slidingwindowitr` #189 and can maybe be merged into that? not sure if this workflow makes sense but seemed worth a shot rather than leaving lots of nit comments :)