Addressing PR comments, remove asarrays
Changing s default to None