adopting hlint's suggestions.
comment.