Fix and clean up arg parsing