Changes for clarity and adding default values.

Thanks @ryhan for advice.