Cleanup

Made it look nice.
Merge pull request #2 from yvescourtois/Clean-Up

Cleanup