Cleaning up XML serialization