refactor
index line
nearly done