Update based on comments

This removes @class and fixes the return type pattern to match the
project standard.  There are a couple of minor changes to the text as
well.