Minor code cleanup,  now defaults to  to avoid having to specify the same address twice