refactoring, logs