Cosmetic changes

Updated some messages, removed some comments