modified to use make_host/make_hosts methods in helpers.rb

- more general cleanup