Refactored parameter defaults into public acccessors