Comments

Minor Clean Up at the same time