Separate the code
Cleaning Code