Cleaned up both index and index_GS (index_GS better I think)