Cleaned up JAXB and Undo/Redo