Tidy and use , for leader