Cleaning of code..