minor code clean-ups