Cleaning some Code