FIX: Refactor