1) Some small optimizations