Clean up to appease splint
Change how we write the output to appease splint