* fixing memory leaks