@catenacyber @yevgenypats
Minor changes from code review
c754c68