clean code
Merge branch 'master' of github.com:Subito-it/Masaccio