A refactoring which takes into consideration some remarks