refactoring + removed log statement