I've made all suggested changes. Please find attached a new patchset.