Some refactor removing status index