[fix] - refactor