Quick Cleanup + Performance Optimizations