Remove byte conversion... not sure what I was thinking
Refactor
Update benchmarks
Move benchmarks to own file