Minor refactor of how props are created.