Minor change: code clean-up.