Minor refactoring/cleanup as per RubyMine