removed unnecessary defaulting of undefined parameters