Reorganizing the code
Cleaning up