Argument clean up.

Makes coding a lot easier for me :D