Cleanup and other improvements 

I do this PR to show you my way for this cookbook,

I will continue on this base to do many improvements later (LWRP...).