this can be cleaned-up a bit by removing all of the `= null`