minor code clean up
minor code clean-up