Cleaning code ......