Formatting the code
Cleaning the code a bit