Small clean-up of code.