code clean-up.