[Find Words] cleanup and optimization