Removed memory leak, cosmetic changes