Reduce allocations

Extension of #2 with `golint`ing and travis test fixes.