Cleaning up a bit
leak hunt