Another minor code clean-up