Slight optimizations