Refactor storage engines
fix duplicated log message