Refacroting code in order to fix all nasty warnings