Fix Potential MemoryLeak , Bad Naming, and #1