rework code according to vuntz suggestions
-rw-r--r-- 1267 TODO
-rwxr-xr-x 36553 spec-cleaner
drwxr-xr-x - tests