minor code clean-up.