Better memory management

No reason, I'll fix that.