code improved
modify code