A little bit more of code clean-up.