Leaking i could use some clean up