Speedup

Add some low hanging optimizations