A few optimizations and cleanups