Cosmetic changes
Fix fatal bug