little clean up to using JAXB