command_builders.rb refactoring