small code clean-up