clear code
some changes