diff --git a/examples/.gitignore b/examples/.gitignore
index ee2d80db..dbe70f71 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -1,4 +1,4 @@
 _test.bat
 ref
 output
-log
\ No newline at end of file
+log
diff --git a/examples/data/style.css b/examples/data/style.css
index 87e5d509..8674fc4f 100644
--- a/examples/data/style.css
+++ b/examples/data/style.css
@@ -2,7 +2,7 @@ body {
 	font: 15px/1.5 Tahoma, Verdana, Myriad Web, Syntax, sans-serif;
 	color: #333;
 	background: #fff url('dibi-powered.gif') no-repeat 99% 1em;
-	margin:	1.6em;
+	margin: 1.6em;
 	padding: 0;
 }
 
diff --git a/tests/dibi/data/sample.mysql.sql b/tests/dibi/data/sample.mysql.sql
index 3f949910..5de3c41e 100644
--- a/tests/dibi/data/sample.mysql.sql
+++ b/tests/dibi/data/sample.mysql.sql
@@ -1,26 +1,11 @@
--- phpMyAdmin SQL Dump
--- version 2.11.1.2
--- http://www.phpmyadmin.net
---
--- Počítač: localhost
--- Vygenerováno: Neděle 02. prosince 2007, 19:49
--- Verze MySQL: 5.0.45
--- Verze PHP: 5.2.1
+-- MySQL: 5.0.45
 
 SET FOREIGN_KEY_CHECKS=0;
 
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 
---
--- Databáze: `dibi`
---
-
 -- --------------------------------------------------------
 
---
--- Struktura tabulky `customers`
---
-
 DROP TABLE IF EXISTS `customers`;
 CREATE TABLE IF NOT EXISTS `customers` (
   `customer_id` int(11) NOT NULL auto_increment,
@@ -28,9 +13,6 @@ CREATE TABLE IF NOT EXISTS `customers` (
   PRIMARY KEY  (`customer_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ;
 
---
--- Vypisuji data pro tabulku `customers`
---
 
 INSERT INTO `customers` (`customer_id`, `name`) VALUES
 (1, 'Dave Lister'),
@@ -42,10 +24,6 @@ INSERT INTO `customers` (`customer_id`, `name`) VALUES
 
 -- --------------------------------------------------------
 
---
--- Struktura tabulky `enumtest`
---
-
 DROP TABLE IF EXISTS `enumtest`;
 CREATE TABLE IF NOT EXISTS `enumtest` (
   `id` int(11) NOT NULL auto_increment,
@@ -53,17 +31,9 @@ CREATE TABLE IF NOT EXISTS `enumtest` (
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
---
--- Vypisuji data pro tabulku `enumtest`
---
-
 
 -- --------------------------------------------------------
 
---
--- Struktura tabulky `orders`
---
-
 DROP TABLE IF EXISTS `orders`;
 CREATE TABLE IF NOT EXISTS `orders` (
   `order_id` int(11) NOT NULL,
@@ -72,9 +42,6 @@ CREATE TABLE IF NOT EXISTS `orders` (
   `amount` float NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
---
--- Vypisuji data pro tabulku `orders`
---
 
 INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES
 (1, 2, 1, 7),
@@ -84,10 +51,6 @@ INSERT INTO `orders` (`order_id`, `customer_id`, `product_id`, `amount`) VALUES
 
 -- --------------------------------------------------------
 
---
--- Struktura tabulky `products`
---
-
 DROP TABLE IF EXISTS `products`;
 CREATE TABLE IF NOT EXISTS `products` (
   `product_id` int(11) NOT NULL auto_increment,
@@ -95,9 +58,6 @@ CREATE TABLE IF NOT EXISTS `products` (
   PRIMARY KEY  (`product_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
---
--- Vypisuji data pro tabulku `products`
---
 
 INSERT INTO `products` (`product_id`, `title`) VALUES
 (1, 'Chair'),
@@ -106,10 +66,6 @@ INSERT INTO `products` (`product_id`, `title`) VALUES
 
 -- --------------------------------------------------------
 
---
--- Struktura tabulky `settest`
---
-
 DROP TABLE IF EXISTS `settest`;
 CREATE TABLE IF NOT EXISTS `settest` (
   `id` int(11) NOT NULL auto_increment,
@@ -117,17 +73,8 @@ CREATE TABLE IF NOT EXISTS `settest` (
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
---
--- Vypisuji data pro tabulku `settest`
---
-
-
 -- --------------------------------------------------------
 
---
--- Struktura tabulky `where`
---
-
 DROP TABLE IF EXISTS `where`;
 CREATE TABLE IF NOT EXISTS `where` (
   `select` int(11) NOT NULL,
@@ -136,9 +83,6 @@ CREATE TABLE IF NOT EXISTS `where` (
   `quot'n' space` int(11) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
---
--- Vypisuji data pro tabulku `where`
---
 
 INSERT INTO `where` (`select`, `dot.dot`, `is`, `quot'n' space`) VALUES
 (1, 2, 3, 4);
@@ -146,4 +90,3 @@ INSERT INTO `where` (`select`, `dot.dot`, `is`, `quot'n' space`) VALUES
 SET FOREIGN_KEY_CHECKS=1;
 
 SET SQL_MODE="STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION";
-