clean up and improvement on blobtracker