Builder.rb some refactoring