Some refactoring, JAXB-trials