Did some code clean-up.