a little more code clean-up