Cleaning some code