FIX: Cleaner arg parsing