Made changes as per suggestions.