Some refactoring
And save the file is good
Non working version