Cleanup from getting CTRL-r index working