diff --git a/lib/treat/entities/entity/buildable.rb b/lib/treat/entities/entity/buildable.rb
index fc59090..3e36ef4 100644
--- a/lib/treat/entities/entity/buildable.rb
+++ b/lib/treat/entities/entity/buildable.rb
@@ -210,8 +210,7 @@ module Treat::Entities::Entity::Buildable
       file.index('.xml')
       from_serialized_file(file)
     else
-      fmt = Treat::Workers::Formatters::
-      Readers::Autoselect.detect_format(file,def_fmt)
+      fmt = Treat::Workers::Formatters::Readers::Autoselect.detect_format(file,def_fmt)
       from_raw_file(file, fmt)
     end
 
diff --git a/lib/treat/workers/lexicalizers/sensers/wordnet.rb b/lib/treat/workers/lexicalizers/sensers/wordnet.rb
index b3d20a9..1f2132f 100755
--- a/lib/treat/workers/lexicalizers/sensers/wordnet.rb
+++ b/lib/treat/workers/lexicalizers/sensers/wordnet.rb
@@ -60,8 +60,7 @@ class Treat::Workers::Lexicalizers::Sensers::Wordnet
     
     lemma.synsets.each do |synset|
       synsets << 
-      Treat::Workers::Lexicalizers::
-      Sensers::Wordnet::Synset.new(synset)
+      Treat::Workers::Lexicalizers::Sensers::Wordnet::Synset.new(synset)
     end
     
     ((synsets.collect do |ss|
diff --git a/lib/treat/workers/processors/chunkers/autoselect.rb b/lib/treat/workers/processors/chunkers/autoselect.rb
index b7f2b57..eb6c66b 100755
--- a/lib/treat/workers/processors/chunkers/autoselect.rb
+++ b/lib/treat/workers/processors/chunkers/autoselect.rb
@@ -5,12 +5,10 @@ class Treat::Workers::Processors::Chunkers::Autoselect
       entity.set :format, 'txt'
     end
     begin
-      k = Treat::Workers::Processors::
-      Chunkers.const_get(entity.format.cc)
+      k = Treat::Workers::Processors::Chunkers.const_get(entity.format.cc)
       k.chunk(entity, options)
     rescue Treat::Exception
-      Treat::Workers::Processors::
-      Chunkers::TXT.chunk(entity, options)
+      Treat::Workers::Processors::Chunkers::TXT.chunk(entity, options)
     end
     
   end
diff --git a/lib/treat/workers/processors/chunkers/txt.rb b/lib/treat/workers/processors/chunkers/txt.rb
index 33d868c..e00e2a5 100755
--- a/lib/treat/workers/processors/chunkers/txt.rb
+++ b/lib/treat/workers/processors/chunkers/txt.rb
@@ -12,16 +12,13 @@ class Treat::Workers::Processors::Chunkers::TXT
     zones.each do |zone|
       zone.strip!
       next if zone == ''
-      c = Treat::Entities::
-      Zone.from_string(zone)
+      c = Treat::Entities::Zone.from_string(zone)
       if c.type == :title
         if current.type == :section
           current = current.parent
-          current = entity << Treat::
-          Entities::Section.new
+          current = entity << Treat::Entities::Section.new
         else
-          current = entity << Treat::
-          Entities::Section.new
+          current = entity << Treat::Entities::Section.new
         end
       end
       current << c
diff --git a/lib/treat/workers/processors/tokenizers/punkt.rb b/lib/treat/workers/processors/tokenizers/punkt.rb
index 4e0033c..e16d51e 100755
--- a/lib/treat/workers/processors/tokenizers/punkt.rb
+++ b/lib/treat/workers/processors/tokenizers/punkt.rb
@@ -28,13 +28,10 @@ class Treat::Workers::Processors::Tokenizers::Punkt
     
     s.scan(ReWordTokenizer).each do |token|
       if SentEndChars.include?(token[-1])
-        entity << Treat::Entities::
-        Token.from_string(token[0..-2])
-        entity << Treat::Entities::
-        Token.from_string(token[-1..-1])
+        entity << Treat::Entities::Token.from_string(token[0..-2])
+        entity << Treat::Entities::Token.from_string(token[-1..-1])
       else
-        entity << Treat::Entities::
-        Token.from_string(token)
+        entity << Treat::Entities::Token.from_string(token)
       end
     end