content search: several cleanups based on PR comments

This commit is to address several style/convention comments
raised in PR 2795.  The code added was following conventions
in the existing code; however, since comments were made related
to them, tried to scrub all of the files that were touched to
better align them with current conventions.