Remove unneeded if statement
Some readability improvements.
Add benchmarks.