some clean code
many change and cleanning
too mush change for know what i've got changed