HSEARCH-735 fixed checkstyle errors
HSEARCH-735 Modified some comments