code clean up + moving to argsparse