Little clean up :)

If you want you can merge it (optional)