remove generic index
cleaned up files
renamed global var