Refactoring, still not correct