Move arg parser definition out of main
Update imports