Cosmetic changes for readability
Some cosmetic changes in markup