Minor cosmetic changes
Minor changes
Merging changes