Minor code clean-up