Tidy up Key index