minor OCD/ruby cleanups to make tests pass