Incorporated suggestions from @marmbrus; thanks!