some repare to make more tidy