Refactor for consistency with extant code