clear code

and perfect some details