little code clean-up