some improvements needed by the locomotive_search gem + clean code