Removing most pointers

[jtenavidal]

There was a design redundancy which added additional complexity to the code. I fixed the redundancy and now most pointers are useless.