Some opinionated code clean-ups