diff --git a/Data/samples/Binding/src/Binding.cpp b/Data/samples/Binding/src/Binding.cpp
index 822cdc82d..25634aad4 100644
--- a/Data/samples/Binding/src/Binding.cpp
+++ b/Data/samples/Binding/src/Binding.cpp
@@ -15,9 +15,6 @@
 // prior written permission from Applied Informatics.
 //
 
-
-#include "Poco/SharedPtr.h"
-#include "Poco/Data/SessionFactory.h"
 #include "Poco/Data/Session.h"
 #include "Poco/Data/SQLite/Connector.h"
 #include <vector>
@@ -62,7 +59,7 @@ int main(int argc, char** argv)
 		use(person.name),
 		use(person.address),
 		use(person.age);
-		
+	
 	insert.execute();
 	
 	person.name    = "Lisa Simpson";
@@ -84,7 +81,7 @@ int main(int argc, char** argv)
 		select.execute();
 		std::cout << person.name << " " << person.address << " " << person.age << std::endl;
 	}
-	
+
 	// another query - store the result in a container
 	std::vector<std::string> names;
 	session << "SELECT Name FROM Person",
@@ -95,6 +92,7 @@ int main(int argc, char** argv)
 	{
 		std::cout << *it << std::endl;
 	}
-	
+
 	return 0;
 }
+
diff --git a/Data/samples/RecordSet/src/RecordSet.cpp b/Data/samples/RecordSet/src/RecordSet.cpp
index 48ee1e420..add9af4ac 100644
--- a/Data/samples/RecordSet/src/RecordSet.cpp
+++ b/Data/samples/RecordSet/src/RecordSet.cpp
@@ -65,19 +65,16 @@ int main(int argc, char** argv)
 	// print all column names
 	for (std::size_t col = 0; col < cols; ++col)
 	{
-		std::cout << rs.columnName(col) << std::endl;
-	}
-	// iterate over all rows and columns
-	bool more = rs.moveFirst();
-	while (more)
-	{
-		for (std::size_t col = 0; col < cols; ++col)
-		{
-			std::cout << rs[col].convert<std::string>() << " ";
-		}
-		std::cout << std::endl;
-		more = rs.moveNext();
+		std::cout << rs.columnName(col) << "\t\t";
 	}
 
+	std::cout << std::endl;
+	std::cout << "-----------------------------------" << std::endl;
+
+	// iterate over all rows and print the data
+	RecordSet::Iterator it = rs.begin();
+	RecordSet::Iterator end = rs.end();
+	for (; it != end; ++it) std::cout << *it;
+
 	return 0;
 }