Leaking i could use some clean up part 2