refactoring and files cleaning #www