Changed: small clean-up.