Incorporated Norman's suggestions and further cosmetic changes