Rubocop tips are fixed: builder.rb