Cleaning Code

Code Cleaning (phase 2)