Some code clean-up.