Cleanup and updated to use a random filename