Initial commit
Code Cleaning