Minor improvenets and style changes