Got rid of void* pointer arithmetic