code tidyup
sorted wrapping for XML content-type
fixed for jaxb