don't mess up properties & initialisers upstream in the change
tiny refactor