Cosmetics, minor optimizations