Code Cleaning

Code Cleaning