Adjust Argument Handling
Cleanup