Fixed memory leak, better presentation.