Minor changes following rubymine code analysis