RUBY-14\nSmall changes to comments and object field names for clarification purposes