code clean 
and add security