Not working commit - save of global refactoring and cleaning