Added defaults to the arguments help text
Clean up the code a little