Revert "Revert "Little cleaning ^_^""

This reverts commit 6ba52f251bfdbd1fb0f471a2ded330310ed61e2d.