Removed some static allocations, I find them ugly