Did a code clean-up.