some refactoring (and Jackson De and Serialization helper)