Cleaned up index file for some validation issues