no more index searches, much faster
Cleaning things up