Small code clean-ups