minor code clean-up