Made some changes per Jay's suggestions.