cleanup of fishy/common.rb