Added more micro-optimizations