admin : refactor to clearer code