Yes, you're right, I'll definitely consider some optimizations.