Minor changes in main and string