Minor code clean-ups