Changing identations style
Some more intedation corrections
Cleaning the code