Cleaning code

* Changing the code-style to reflect my own