cleanup
add index