Made arguments optional
Cleanup