Small optimizations and clean up