code improve

code improve