diff --git a/alib2xml/src/core/xmlApi.hpp b/alib2xml/src/core/xmlApi.hpp
index b24882369fee7d926c08ba08d8ae32659277a991..fc8822fba296f6411a94e67008f1cd88613c39aa 100644
--- a/alib2xml/src/core/xmlApi.hpp
+++ b/alib2xml/src/core/xmlApi.hpp
@@ -33,7 +33,7 @@ class xmlApiInputContext : public ext::deque < sax::Token >::iterator {
 	ext::map < int, object::Object > idToInstanceContexts;
 
 public:
-	explicit xmlApiInputContext ( ext::deque < sax::Token >::iterator iter ) : ext::deque < sax::Token >::iterator ( iter ) {
+	explicit xmlApiInputContext ( ext::deque < sax::Token >::iterator iter ) : ext::deque < sax::Token >::iterator ( std::move ( iter ) ) {
 	}
 
 	ext::map < int, object::Object > & idToInstance ( ) {
@@ -44,11 +44,10 @@ public:
 
 class xmlApiOutputContext : public ext::deque < sax::Token > {
 	ext::map < object::Object, int > instanceToIdContexts;
-	int idMaxContext;
+	int idMaxContext = 0;
 
 public:
-	xmlApiOutputContext ( ) : idMaxContext ( 0 ) {
-	}
+	xmlApiOutputContext ( ) = default;
 
 	ext::map < object::Object, int > & instanceToId ( ) {
 		return instanceToIdContexts;