-cleaned up index and seperated out for easier management