FIX: refactor converter