Some style improvement