Fixed settings{} and cleaned up index