Memory leak fix
Memory leak and grammar fix