Tune optimization
Simplify code a bit
Adjust benchmark examples