suggestions from code review, renaming, comment cleanup

RUBY-676