Refactor: moving support code to setup.rb