FIX: Minor refactor