I have made all the suggested changes. Please find attached a new patch.