refactoring almost ready
refactoring /1
refactor /2
refactoring /2 -- try to finish something !!
refactoring: the end is ny :-)
refactoring: ready to merge with master