a little code clean-up