Small oops, caught it before running :)
Spotlight re-ordering and cleanup