Slight changes and clean-up.