This is cleaned up in the rubocop branch. I didn't want to get into the 3000+ rubocop violations in this branch.