Cleanup + Small Optimizations