a little changes

optimization