Not working commit: refactoring