Move defaults to __init__

Avoid them being overwritten in the function