minor, code clean-up