Better argument input handling