cosmetic changes
Program stays in a loop until exit