cleaning some code2