small cleanups

5 jobs for NIFTy_5 in 2 minutes and 6 seconds (queued for 3 seconds)