minor code clean-up - no real changes