refactoring, fixing overrefactoring