Minor optimizations
Cleanups