Changes made as per Chris' comments