Small refactor to remove extraneous variable assignment