EQ-1450 improve find_all_usage
EQ-1450 Code cleanup and performance improvement
EQ-1450 Code cleanup
coding style