Refactoring, working commit