Minor wording cleanup and avoid assigning unnecessary runtime variable