Minor changes. No functionality added.