Small optimizations/simplifications