change assigments with -= and +=
More code cleaning
work with a simple model