Little clean-up changes;