Changes made as per Leo

Changes made as I understood them.