refactoring, remove prints