Edits made based on code review

Signed-off-by: JamesDeFabia <james.defabia@lexisnexis.com>
Edits based on feedback