Minor cosmetic changes and added comments