[fix] Slight refactoring.