Argument parser refactoring