Refactoring
Fixed bug in data edition