refactoring + handle more details from log file