Improve readability of Findable
Improve readability of Findable