random cleanup

See commits.
just noticed: wrong `its`!