Refactor and simplify spotlightify and helper methods