I have made all the changes which you suggested in comments. Please take a look.