refactor feature computing