minor readability improvements for find_by_*