code Cleaning