Made some small clean-up changes.