Minor cleanup

Small cleanup to have a more readable code and be more go idiomatic.

Benchmark pointer vs nonpointer slice: https://gist.github.com/creack/9e0e46463ecc1d6a7148
Revert.