refact a little 

as title