Make some little improvement