Fixed argument setting bug
Cleaning up