Made changes that Scott suggested.