FIX: Cleanup/refactor