made changes as suggested by diana khuang 

@cdodge , i have done some changes as suggested by dianakhuang. kindly review them.