just code clean-up