HSEARCH-436 Some whitespace and style improvements