Slight optimizations 1483