more tiny cleanups
credit goes to hlint for these ones