Cleaning code done