Minor changes after code review

Removed some unneccessary pointers, among others