some code cleanup per RubyMine inspection recommendations.