cleaning some code