RUBY-781 Cleanup after PR code review