Cleaned up arg parsing