Refine and cleanup index and package