Slight clean-up.